Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Fri, 21 Oct 2005 14:34:17 +0000 (15:34 +0100)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Fri, 21 Oct 2005 14:34:17 +0000 (15:34 +0100)

Trivial merge